This reverts commit fe975858, reversing changes made to 29398fac.
Reverting because the db:migration testing job wasn't triggering in non-decomposed mode