Could you add a test for this change? If I revert it I don't get any test failures.