Revert the changes needed to fix #3293.
Merge branch 'develop' of github.com:saltstack/salt into develop