Revert Experimental Touchscreen driver changes