diff --git a/service.cpp b/service.cpp
index 755e463..63d756c 100644
--- a/service.cpp
+++ b/service.cpp
@@ -77,15 +77,7 @@
 
     IPCThreadState::self()->setupPolling(&binder_fd);
     if (binder_fd < 0) {
-        ALOGE("Failed to aquire binder FD; staying around but doing nothing");
-        // hwservicemanager is a critical service; until support for /dev/hwbinder
-        // is checked in for all devices, prevent it from exiting; if it were to
-        // exit, it would get restarted again and fail again several times,
-        // eventually causing the device to boot into recovery mode.
-        // TODO: revert
-        while (true) {
-          sleep(UINT_MAX);
-        }
+        ALOGE("Failed to aquire binder FD.");
         return -1;
     }