Just a reminder that we need to add the patch from #853 to the integration tests.
Just a reminder that we need to add the patch from #853 to the integration tests.