Revert "Merge pull request #4075 from atomicdryad/i_accidentally_the_coordinate_spaghetti"

This reverts commit 696ffa15c36a1ccf696c38bb9e85745fc992794e, reversing
changes made to 9c1f4cbeee4efe456fb09c0c567d21c54addb0da.

full speed reverse!