AlisdairM:revert_trivial_relocation was force-pushed and no longer has any new commits.

Pushing new commits will allow the pull request to be re-opened.