Revert back to always having x and y values of cursor

This seems to be a lot faster approach.