2.0 backport faster consistency checker