diff --git a/base b/base
index 8e39d6149..3ca13f3f2 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 8e39d61493257c05fe039f34fa1a6e3ae5f0eab6
+Subproject commit 3ca13f3f2cb1f3267ce5c7fa309c29a345387f12
diff --git a/frontend/device/kindle/powerd.lua b/frontend/device/kindle/powerd.lua
index de1e80213..644a27a41 100644
--- a/frontend/device/kindle/powerd.lua
+++ b/frontend/device/kindle/powerd.lua
@@ -27,8 +27,10 @@ end
 function KindlePowerD:toggleFrontlight()
     local sysint = self:read_int_file(self.fl_intensity_file)
     if sysint == 0 then
-        self:setIntensity(self.fl_intensity)
+        -- NOTE: We want to bypass setIntensity's shenanigans and simply restore the light as-is
+        self:setIntensityHW()
     else
+        -- NOTE: We want to really kill the light, so do it manually (asking lipc to set it to 0 would in fact set it to 1)...
         os.execute("echo -n 0 > " .. self.fl_intensity_file)
     end
 end
diff --git a/reader.lua b/reader.lua
index 117dac0c3..1f14dc5e6 100755
--- a/reader.lua
+++ b/reader.lua
@@ -117,7 +117,7 @@ end
 
 -- restore kobo frontlight settings and probe kobo touch coordinates
 if Device:isKobo() then
-    if Device.hasFrontlight then
+    if Device:hasFrontlight() then
         local powerd = Device:getPowerDevice()
         if powerd and powerd.restore_settings then
             -- UIManager:init() should have sanely set up the frontlight_stuff by this point