Revert "merge #18145"
Merge pull request #18173 from saltstack/revert-18172-cachedout-at_quote

Revert "merge #18145"