This fixes #7733.