Validation order matters.
Re-apply c197de7f37df2d49d6f9955b6bd23c2b44abf052

Bad rebase? Dunno.