diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fedbe8e53..54dfbafe8 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
 	* org.el (org-get-scheduled-time, org-get-deadline-time): New
 	functions.
+	(org-return-follows-link): Revert making this the default untile
+	issues are resolved.
 
 	* org-agenda.el (org-agenda-skip-if): New conditions timestamp and
 	nottimestamp.
diff --git a/lisp/org.el b/lisp/org.el
index 453429321..c734d7160 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1113,7 +1113,7 @@ Needs to be set before org.el is loaded."
   :group 'org-link-follow
   :type 'boolean)
 
-(defcustom org-return-follows-link t
+(defcustom org-return-follows-link nil
   "Non-nil means, on links RET will follow the link.
 Needs to be set before org.el is loaded."
   :group 'org-link-follow