Is this just a separate bugfix we can push from an unrelated branch?
And if so, how did our test suite miss it? We need to add a test that checks for a relevant condition and fails under the older version.