Undoes unexpected changes to location keys

Unexpected changes made in c30b7301839a8c729eff8a6c7050cde36d92cdc5.