Revert "Touch and long touch points"

This reverts commit df8aa1cc157170079e40fc783505f23bb84bd82b.
Merge branch 'master' into touch-points-2