Revert "Fix salt-cloud regression"

Reverts saltstack/salt#15335