Remove some code which should have been removed while cherry-picking.
Remove some code which should have been removed while cherry-picking.

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