Reverted changes in location.cpp. Unclear what the purpose of the change
was meant to be (this is why issues should be reported in the issue
list).