This fixes #8262.