Revert "Make discipline incident generation more deterministic to fix spec failure"

This reverts commit 29b590504ecc87a349cdfa1ee029e793fd8a089b.