Revert "Merge pull request #2319 from ffa/improve_options_support"
Revert "Merge pull request #2319 from ffa/improve_options_support"

This reverts commit 41dfb03a1c834de99623e313957d6c962e3a7087, reversing
changes made to 265f97ff438f32eca7e4a05679d538e27045ae7f.

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