Not migration changes

Let try this way to see if we can land all this stuff without breaking migrations on Travis again.