Rearrange Rake tasks to try to make super annoying DB problem go away again