Revert "Revert "Revert "Fix HighTouchSensivity (1/2)"""

This reverts commit 94e778ddb51e30f67c6a096b8ee234faf847738d.