preserve the original transport when activating/deactivating
Merge pull request #1 from jarcoal/original_transport

preserve the original transport when activating/deactivating