diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c
index 93ed4d1ec3..7512535ba8 100644
--- a/firmware/lib/vboot_kernel.c
+++ b/firmware/lib/vboot_kernel.c
@@ -429,9 +429,10 @@ int LoadKernel(LoadKernelParams* params) {
     return LOAD_KERNEL_SUCCESS;
   }
 
-  // Handle error cases
-  if (found_partitions)
-    return LOAD_KERNEL_INVALID;
-  else
-    return LOAD_KERNEL_NOT_FOUND;
+  /* The BIOS may attempt to display different screens depending on whether
+   * we find an invalid kernel partition (return LOAD_KERNEL_INVALID) or not.
+   * But the flow is changing, so for now treating both cases as invalid gives
+   * slightly less confusing user feedback. Sigh.
+   */
+  return LOAD_KERNEL_INVALID;
 }
diff --git a/firmware/version.c b/firmware/version.c
index 91f00a70a4..b6e6b2297b 100644
--- a/firmware/version.c
+++ b/firmware/version.c
@@ -1 +1 @@
-char* VbootVersion = "VBOOv=b4df7bb0";
+char* VbootVersion = "VBOOv=2c899e79";