Revert "Merge branch 'touchdemand' into jb"

This reverts commit dedb8116bdb707b3d81a8e5112805b55cf425236, reversing
changes made to bd8a0d5c85cb45075ecae4145568aac110cb2baf.