Add a test that fails if this fix is reverted.
@toddbaert I would like to work on this issue can you assign it to me?