This fixes #7703.