revert and fix-up capacitive buttons
not sure what was goin on here, but lets take these back to stock M7