Revert "Fix two problems with runners"
Revert "Fix two problems with runners"

This reverts commit 389fb7e030b3cb340cec6c6d4975d95887819c13.

Conflicts:
	salt/client/mixins.py

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt