Revert "Touchscreen optimizations"

This reverts commit ff9a0bc1eeed6231b407b090b0480023bf8e502d.