Remove leftover code from the draggable/tap cleanup. Fixes #2103
Merge pull request #2111 from danzel/fix-2103

Remove leftover code from the draggable/tap cleanup. Fixes #2103