#5440 does steps 2 and part of 3 of the migration procedure documented in #5026, but it would be good to do steps 1, the rest of 3, and 4 as well.
