Back out list matcher optimization, somehow breaks nodegroup matching.
Back out list matcher optimization, somehow breaks nodegroup matching.

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