Fresh fix commit for saltstack/salt repo issue #11096