We should test this migration sooner than later to get rid of of problems in 4.14, and very likely introduce a heap of new regressions in the process.
