Re-enable touch efp optimization for simple case