Fresh fix commit for saltstack/salt repo issue #11096

Sorry about the git(hub) mixup... this pull request should be sane now and had the unnecessary changes to the build_rule() prototype reverted.