Revert "Store Sone earlier when creating new Sone"