Make discipline incident generation more deterministic to fix spec failure