Revert "Touchscreen optimizations"

This reverts commit b675bdb0ad98f7381e6cd30413e92b7795aecc7a.