Revert "Touchscreen optimizations"

This reverts commit bca98b91e333b01baa05e24f78b470b43f3ec3f2.

may be causing a build break