diff --git a/collects/typed-racket/base-env/base-env.rkt b/collects/typed-racket/base-env/base-env.rkt
index 053cc3a2..f8c9835d 100644
--- a/collects/typed-racket/base-env/base-env.rkt
+++ b/collects/typed-racket/base-env/base-env.rkt
@@ -1056,6 +1056,7 @@
 [variable-reference->empty-namespace (-> -Variable-Reference -Namespace)]
 [variable-reference->namespace (-> -Variable-Reference -Namespace)]
 [variable-reference->resolved-module-path (-> -Variable-Reference (-opt -Resolved-Module-Path))]
+[variable-reference->module-declaration-inspector (-> -Variable-Reference -Inspector)]
 [variable-reference->module-source (-> -Variable-Reference (Un Sym (-val #f) -Path))]
 [variable-reference->phase (-> -Variable-Reference -Nat)]
 [variable-reference-constant? (-> -Variable-Reference -Boolean)]
diff --git a/collects/typed-racket/utils/disarm.rkt b/collects/typed-racket/utils/disarm.rkt
index 3e31384c..ef1e0a9d 100644
--- a/collects/typed-racket/utils/disarm.rkt
+++ b/collects/typed-racket/utils/disarm.rkt
@@ -22,5 +22,7 @@
                       (cons a d)))]
      [else v])))
 
-(define orig-insp (current-code-inspector))
+(define orig-insp (variable-reference->module-declaration-inspector
+                   (#%variable-reference)))
+
 
diff --git a/collects/typed/private/rewriter.rkt b/collects/typed/private/rewriter.rkt
index f8540fd4..a65c1006 100644
--- a/collects/typed/private/rewriter.rkt
+++ b/collects/typed/private/rewriter.rkt
@@ -2,7 +2,9 @@
 (require (for-syntax syntax/parse racket/base syntax/id-table racket/dict
                      unstable/debug))
 
-(define-for-syntax code-insp (current-code-inspector))
+(define-for-syntax code-insp
+  (variable-reference->module-declaration-inspector
+   (#%variable-reference)))
 
 (define-for-syntax (rewrite stx tbl from)
   (define (rw stx)