This fixes #7890.