Revert "s"

Reverts tmac4096/Location#3