This fixes #7875.  Everything is now moved.