This fixes #8120.