Reverting fix for multi-touch gestures. Has been moved to a separate pull request.