Revert "Add :x and :y to screen map when necessary"

This reverts commit 1c85268b955d4dce59274220a130af1ab5097f79.