Reverting transport mode switch

Andrew's change caused conflict with unload all