diff --git a/host/lib/write_firmware.py b/host/lib/write_firmware.py
index 5d3631d..391266a 100644
--- a/host/lib/write_firmware.py
+++ b/host/lib/write_firmware.py
@@ -360,6 +360,8 @@
     Args:
       args: List of arguments to dut-control.
 
+    Retruns:
+      a string, stdout generated by running the command
     Raises:
       IOError if no servo access is permitted.
     """
@@ -367,7 +369,7 @@
       raise IOError('No servo access available, please use --servo')
     if self._servo_port:
       args.extend(['-p', '%s' % self._servo_port])
-    self._tools.Run('dut-control', args)
+    return self._tools.Run('dut-control', args)
 
   def _ExtractPayloadParts(self, payload):
     """Extract the BL1, BL2 and U-Boot parts from a payload.
@@ -449,13 +451,20 @@
     vendor_id = 0x04e8
     product_id = 0x1234
 
-    self._out.Progress('Reseting board via servo')
+    # Preserve dut_hub_sel state.
+    preserved_dut_hub_sel = self._DutControl(['dut_hub_sel',]
+                                             ).strip().split(':')[-1]
+    required_dut_hub_sel = 'dut_sees_servo'
     args = ['warm_reset:on', 'fw_up:on', 'pwr_button:press', 'sleep:.1',
         'warm_reset:off']
+    if preserved_dut_hub_sel != required_dut_hub_sel:
+      # Need to set it to get the port properly powered up.
+      args += ['dut_hub_sel:%s' % required_dut_hub_sel]
     # TODO(sjg) If the board is bricked a reset does not seem to bring it
     # back to life.
     # BUG=chromium-os:28229
     args = ['cold_reset:on', 'sleep:.2', 'cold_reset:off'] + args
+    self._out.Progress('Reseting board via servo')
     self._DutControl(args)
 
     # If we have a kernel to write, create a new image with that added.
@@ -500,8 +509,11 @@
           self._DutControl(args)
 
     finally:
-      # Make sure that the power button is released, whatever happens
+      # Make sure that the power button is released and dut_sel_hub state is
+      # restored, whatever happens
       args = ['fw_up:off', 'pwr_button:release']
+      if preserved_dut_hub_sel != required_dut_hub_sel:
+        args += ['dut_hub_sel:%s' % preserved_dut_hub_sel]
       self._DutControl(args)
 
     self._out.Notice('Image downloaded - please see serial output '