Fix failure to reset state to "to fit DCP" properly (#2081).