This fixes #7762.