Revert "Touchscreen optimizations"

This reverts commit 36bea5acf25868051fe70b0ebe68cb0cef59f772.