Revert commit 1a90b5f.
Merge pull request #15861 from kostko/revert-15550

Unbreak salt-ssh highstate TypeError