Backout ab25dcdc319b (bug 960146) for touch event regressions