Revert "Location Format change"

This reverts commit 1ec38d4324eb5f57c04b2992fbcf251216c3c429.