Revert "Add touch-punch"