Alright, revert r21229 for now. Stupid me forgetting about the inclusion sequence :(