This have been regressed after a certain refactoring. Should resolve bug #58267