Revert "Finish basic add-location functionality"

This reverts commit c066b05e4d84e9db9d8a615186178ff2aef07c48.