diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 34a3c47..cc31d9e 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -29,7 +29,6 @@
 #include <hidl/Status.h>
 
 #include <android-base/logging.h>
-#include <android-base/properties.h>
 #include <hidl-util/FQName.h>
 #include <hidl-util/StringHelper.h>
 #include <hwbinder/IPCThreadState.h>
@@ -43,8 +42,6 @@
 #define RE_PATH         RE_COMPONENT "(?:[.]" RE_COMPONENT ")*"
 static const std::regex gLibraryFileNamePattern("(" RE_PATH "@[0-9]+[.][0-9]+)-impl(.*?).so");
 
-using android::base::WaitForProperty;
-
 using android::hidl::manager::V1_0::IServiceManager;
 using android::hidl::manager::V1_0::IServiceNotification;
 using android::hidl::manager::V1_0::BpHwServiceManager;
@@ -58,12 +55,6 @@
 extern sp<android::hidl::manager::V1_0::IServiceManager> gDefaultServiceManager;
 }  // namespace details
 
-static const char* kHwServicemanagerReadyProperty = "hwservicemanager.ready";
-
-void waitForHwServiceManager() {
-    while (!WaitForProperty(kHwServicemanagerReadyProperty, "true", std::chrono::milliseconds::max())) {}
-}
-
 sp<IServiceManager> defaultServiceManager() {
 
     {
@@ -76,15 +67,11 @@
             // this process.
             return nullptr;
         }
-
-        waitForHwServiceManager();
-
         while (details::gDefaultServiceManager == NULL) {
             details::gDefaultServiceManager =
                     fromBinder<IServiceManager, BpHwServiceManager, BnHwServiceManager>(
                         ProcessState::self()->getContextObject(NULL));
             if (details::gDefaultServiceManager == NULL) {
-                LOG(ERROR) << "Waited for hwservicemanager, but got nullptr.";
                 sleep(1);
             }
         }