diff --git a/frontend/cache.lua b/frontend/cache.lua
index 01f95c4a9..f822de880 100644
--- a/frontend/cache.lua
+++ b/frontend/cache.lua
@@ -9,7 +9,7 @@ local md5 = require("ffi/sha2").md5
 
 local CanvasContext = require("document/canvascontext")
 if CanvasContext.should_restrict_JIT then
-    require("jit").off(true, true)
+    jit.off(true, true)
 end
 
 local function calcFreeMem()
diff --git a/frontend/device/android/device.lua b/frontend/device/android/device.lua
index 38531567e..71d5c6f03 100644
--- a/frontend/device/android/device.lua
+++ b/frontend/device/android/device.lua
@@ -119,12 +119,7 @@ local Device = Generic:new{
     -- required for those modules where it *really* matters (e.g., ffi/blitbuffer.lua).
     -- This is also why we try to actually avoid entering actual loops in the Lua blitter on Android,
     -- and instead attempt to do most of everything via the C implementation.
-    -- (FIXME:
-    -- Revert the bits of https://github.com/koreader/koreader-base/pull/1200
-    -- that made nightmode go through the Lua blitter again)
-    -- NOTE: So, on that joyous note, it's been 5 years since the last time we touched that, so,
-    --       let's try to disable it and watch the world burn ;).
-    should_restrict_JIT = false,
+    should_restrict_JIT = true,
 }
 
 function Device:init()
diff --git a/frontend/ui/rendertext.lua b/frontend/ui/rendertext.lua
index 907cc480d..e062ef23c 100644
--- a/frontend/ui/rendertext.lua
+++ b/frontend/ui/rendertext.lua
@@ -15,7 +15,7 @@ local bor = bit.bor
 local lshift = bit.lshift
 
 if Device.should_restrict_JIT then
-    require("jit").off(true, true)
+    jit.off(true, true)
 end
 
 --[[
diff --git a/frontend/ui/widget/container/inputcontainer.lua b/frontend/ui/widget/container/inputcontainer.lua
index 503cd61ef..6ae9bec71 100644
--- a/frontend/ui/widget/container/inputcontainer.lua
+++ b/frontend/ui/widget/container/inputcontainer.lua
@@ -35,7 +35,7 @@ local Screen = Device.screen
 local _ = require("gettext")
 
 if Device.should_restrict_JIT then
-    require("jit").off(true, true)
+    jit.off(true, true)
 end
 
 local InputContainer = WidgetContainer:new{
diff --git a/frontend/ui/widget/container/widgetcontainer.lua b/frontend/ui/widget/container/widgetcontainer.lua
index c285c6cac..b4528bcfb 100644
--- a/frontend/ui/widget/container/widgetcontainer.lua
+++ b/frontend/ui/widget/container/widgetcontainer.lua
@@ -18,7 +18,7 @@ local Widget = require("ui/widget/widget")
 local Device = require("device")
 
 if Device.should_restrict_JIT then
-    require("jit").off(true, true)
+    jit.off(true, true)
 end
 
 local WidgetContainer = Widget:new()
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index 7b2972c9c..9099a388a 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit 7b2972c9c5ceb53629d56d88096e008933ce0828
+Subproject commit 9099a388a09259285bcc9f96dde2149005113d36