Revert "NEX-1923 Retiring a device may hang or have leave device unusable after unretire"

This reverts commit b0d0533fb680a96907e66ac73bf2112dff27e61d.
NEX-1923 Retiring a device may hang or have leave device unusable after unretire