Revert "Build Location Change"

This reverts commit b64dd590547f96583896138660c24ac6d62c69cc.