Revert: Touchscreen Drivers - Fix S2W