Revert "Re-location"

This reverts commit a0d3f72120a4a9b42088a12e54381d1d5b972da7.