Revert "Playing around with map location"

This reverts commit e5aa26c69222808f56bb4ae17fdc4b21738509b1.