Wip 9419

I want to run an upgrade test suite, but don't find any older runs that hit this problem.
Yeah, should work as is.