I cloned HHH-12074 Resolved since I'm not sure the right approach is to reopen it (plus, I don't have permissions to do that).

This is for the second test case, which I'll create a pull request for.