This provides additional test coverage but isn't a regression test for
the ticket's issue.

Backport of 1d009238 from master