diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index e736667715a..d7076d4b3a7 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -124,15 +124,12 @@ May either be a string or a list of strings.")
     (epa-passphrase-callback-function context key-id nil)))
 
 (defun epa-file-handler (operation &rest args)
-  ;; (save-match-data
-  ;;   (let ((op (get operation 'epa-file)))
-  ;;     (if (and op
-  ;; 	       (if (and (eq operation 'insert-file-contents)
-			
-  ;; 			(y-or-n-p ""
-  ;; 	  (apply op args)
-  ;; 	(epa-file-run-real-handler operation args)))))
-  nil)
+  (save-match-data
+    (let ((op (get operation 'epa-file)))
+      (if op
+  	  (apply op args)
+  	(epa-file-run-real-handler operation args)))))
+
 (defun epa-file-run-real-handler (operation args)
   (let ((inhibit-file-name-handlers
 	 (cons 'epa-file-handler