Revert #18254

This breaks the reactor, at least when executing a runner, resulting in the
traceback noted here: 

https://github.com/saltstack/salt/issues/18710#issuecomment-65695397

cc: @jacksontj