This fixes #7719.