This must be a fix for a separate bug or regression, right?