Doh, fix build.
Fix infinite recursion (regression a few commits back), oops!
Revert "Temporarily disable deleting the stores, for testing." - This is for real now, we migrate it once, delete it from the database, so we won't migrate it in future.

This reverts commit 26e6f0e9cf9772aad2dabf7d010a8b27f8aa41e1.