Restack

This restacks the commits as requested. Please verify that it looks good so that we can complete the migration and continue on functionality pull requests. After you review this PR, you'll need to `git push --force`, as this is a history-rewriting PR.