This fixes #7701.