Revert "Merge pull request #27 from assemblymade/revert-21-revert-10-location-fix"

This reverts commit 039aae1f5930994f4fc8e51699c5d18f39a1dea1, reversing
changes made to 8458d57de07b25a572ac21b514ab866b42f2249f.