Revert "merge #18145"

Reverts saltstack/salt#18172