diff --git a/fs_mgr/fs_mgr_remount.cpp b/fs_mgr/fs_mgr_remount.cpp
index d4a741240..d70c8ff84 100644
--- a/fs_mgr/fs_mgr_remount.cpp
+++ b/fs_mgr/fs_mgr_remount.cpp
@@ -634,8 +634,9 @@ int main(int argc, char* argv[]) {
         LOG(ERROR) << "Device must be userdebug build";
         return EXIT_FAILURE;
     }
-
-#if ALLOW_ADBD_DISABLE_VERITY == 0  // "user" build
+#if 0
+    // We already use safety net hacks which spoof to green state.
+    // Remove this check completely.
     if (android::base::GetProperty("ro.boot.verifiedbootstate", "") != "orange") {
         LOG(ERROR) << "Device must be bootloader unlocked";
         return EXIT_FAILURE;