Revert bandaid for StartTouch bug so can be tested for fix