This should prevent #8358 from happening again. Note that, because it's not fixed yet, this test *will* fail.