saltstack/salt — pull request #18173 by thatch45 (2014-11-18 00:19:29+00:00)
Title: Revert "merge #18145"

Reverts saltstack/salt#18172