Save the original transport in runner after detecting the smart transport

Fixes #6192