Revert "Adjusting coordinate calculations"

This reverts commit af374941e662cd97f52d89bdc95401a66d942429.