Revert "Tap disable was a bit buggy"

This reverts commit 98a5e80aa4d588fc82fef7114eda2333978dbb0f.
Removed test commits