Revert "Moved Locations"

This reverts commit 98bf9cdff3fd15c73417bfda51b2754cbb870b84.