Backed out changeset e982377e39a3 (bug 960897) since the new test_touchcaret.py intermittently fails