Revert "Map should open at user's location, work-in-progress #97"

Manual merge didn't quite work out, so reverting in favor of
rebasing the original PR

This reverts commit 0b84c06934c2e025edce832fbdf4527f183ac9fb.