This reverts commits 2010fbb0e6, a361ce47a1, and d004bb275a.
2010fbb0e6
a361ce47a1
d004bb275a
testCompassTap