diff --git a/infer/lib/python/inferlib/analyze.py b/infer/lib/python/inferlib/analyze.py
index 0838a7316..25ef18402 100644
--- a/infer/lib/python/inferlib/analyze.py
+++ b/infer/lib/python/inferlib/analyze.py
@@ -431,9 +431,7 @@ class Infer:
             infer_options += ['-project_root', self.args.project_root]
 
         if self.args.analyzer in [config.ANALYZER_CHECKERS]:
-            # TODO: 9936222: restore on-demand for the checkers
-            # os.environ['INFER_ONDEMAND'] = 'Y'
-            pass
+            os.environ['INFER_ONDEMAND'] = 'Y'
 
         os.environ['INFER_OPTIONS'] = ' '.join(infer_options)
 
diff --git a/infer/tests/codetoanalyze/java/checkers/BUCK b/infer/tests/codetoanalyze/java/checkers/BUCK
index cc1259a76..dc85ce926 100644
--- a/infer/tests/codetoanalyze/java/checkers/BUCK
+++ b/infer/tests/codetoanalyze/java/checkers/BUCK
@@ -19,7 +19,6 @@ out = 'out'
 clean_cmd = ' '.join(['rm', '-rf', out])
 classpath = ':'.join([('$(classpath ' + path + ')') for path in dependencies])
 infer_cmd = ' '.join([
-    'INFER_ONDEMAND=Y',
     'infer',
     '--no-progress-bar',
     '--absolute-paths',