diff --git a/waagent b/waagent
index d3eecb9..2938e88 100644
--- a/waagent
+++ b/waagent
@@ -1190,10 +1190,8 @@ class UbuntuDistro(debianDistro):
     def waitForSshHostKey(self, path):
         """
         Wait until the ssh host key is generated by cloud init.
-        TODO: tuning the waiting interval to a reasonable value
         """
-        for retry in range(0, 300):
-            Log("TODO: REMOVE THIS LINE - Check host key status")
+        for retry in range(0, 10):
             if(os.path.isfile(path)):
                 return True
             time.sleep(1)