diff --git a/MdeModulePkg/Library/BootManagerUiLib/BootManager.c b/MdeModulePkg/Library/BootManagerUiLib/BootManager.c
index 82038879c5..8cc6e24386 100644
--- a/MdeModulePkg/Library/BootManagerUiLib/BootManager.c
+++ b/MdeModulePkg/Library/BootManagerUiLib/BootManager.c
@@ -1,7 +1,7 @@
 /** @file
   The boot manager reference implementation
 
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed and made available under
 the terms and conditions of the BSD License that accompanies this distribution.
 The full text of the license may be found at
@@ -419,8 +419,7 @@ BmDevicePathToStr (
 }
 
 /**
-  This function invokes Boot Manager. If all devices have not a chance to be connected,
-  the connect all will be triggered. It then enumerate all boot options. If 
+  This function invokes Boot Manager. It then enumerate all boot options. If
   a boot option from the Boot Manager page is selected, Boot Manager will boot
   from this boot option.
   
@@ -450,8 +449,6 @@ UpdateBootManager (
 
   DeviceType = (UINT16) -1;
 
-  EfiBootManagerConnectAll ();
-
   //
   // for better user experience
   // 1. User changes HD configuration (e.g.: unplug HDD), here we have a chance to remove the HDD boot option