This reverts commit c6098c39. Reason for revert: breaks all touch input Change-Id: I37c94d73b7413f930ab421c9dbffe284e6d536d4