r22819: Fix Bug 4613. We just dumped the must change & friends. With the