#687, #711: Keep disabled validators VALID, thanks to @talberti