Partially revert "Port #53452 to master"
Partially revert "Port #53452 to master"

This reverts commit 60b820c7b6a3f08dd3f9577f1c5c11c1f7954126.

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