diff --git a/src/report/report-system/report-system.scm b/src/report/report-system/report-system.scm
index 7dc7900f2a..9c4a25747b 100644
--- a/src/report/report-system/report-system.scm
+++ b/src/report/report-system/report-system.scm
@@ -109,7 +109,6 @@
 (export gnc:report-template-version)
 (export gnc:report-template-name)
 (export gnc:report-template-options-generator)
-(export gnc:report-template-options-editor)
 (export gnc:report-template-options-cleanup-cb)
 (export gnc:report-template-options-changed-cb)
 (export gnc:report-template-renderer)
@@ -135,7 +134,6 @@
 (export gnc:make-report)
 (export gnc:restore-report)
 (export gnc:make-report-options)
-(export gnc:report-options-editor)
 (export gnc:report-export-thunk)
 (export gnc:report-menu-name)
 (export gnc:report-name)
@@ -144,6 +142,7 @@
 (export gnc:all-report-template-names)
 (export gnc:report-remove-by-id)
 (export gnc:find-report)
+(export gnc:find-report-template)
 (export gnc:report-generate-restore-forms)
 (export gnc:report-render-html)
 (export gnc:report-run)
diff --git a/src/report/report-system/report.scm b/src/report/report-system/report.scm
index d779eaaa26..5d8419e144 100644
--- a/src/report/report-system/report.scm
+++ b/src/report/report-system/report.scm
@@ -51,8 +51,7 @@
 (define <report-template>
   (make-record-type "<report-template>"
                     ;; The data items in a report record
-                    '(version name 
-                              options-generator options-editor 
+                    '(version name options-generator
                               options-cleanup-cb options-changed-cb
                               renderer in-menu? menu-path menu-name
                               menu-tip export-thunk)))
@@ -70,7 +69,6 @@
      #f                         ;; version
      #f                         ;; name
      #f                         ;; options-generator
-     #f                         ;; options-editor
      #f                         ;; options-cleanup-cb
      #f                         ;; options-changed-cb
      #f                         ;; renderer
@@ -106,8 +104,6 @@
   (record-accessor <report-template> 'name))
 (define gnc:report-template-options-generator
   (record-accessor <report-template> 'options-generator))
-(define gnc:report-template-options-editor
-  (record-accessor <report-template> 'options-editor))
 (define gnc:report-template-options-cleanup-cb
   (record-accessor <report-template> 'options-cleanup-cb))
 (define gnc:report-template-options-changed-cb
@@ -268,16 +264,6 @@
         (gnc:report-template-new-options template)
         #f)))
 
-(define (gnc:report-options-editor report) 
-  (let ((template 
-         (hash-ref  *gnc:_report-templates_* 
-                    (gnc:report-type report))))
-    (if template
-        (let ((ed (gnc:report-template-options-editor template)))
-	  (if ed ed 
-	      gnc:default-options-editor))
-        #f)))
-
 (define (gnc:report-export-thunk report)
   (let ((template 
          (hash-ref  *gnc:_report-templates_* 
@@ -335,6 +321,9 @@
 (define (gnc:find-report id) 
   (hash-ref *gnc:_reports_* id))
 
+(define (gnc:find-report-template report-type) 
+  (hash-ref *gnc:_report-templates_* report-type))
+
 (define (gnc:report-generate-restore-forms report)
   ;; clean up the options if necessary.  this is only needed 
   ;; in special cases.