This fixes #8419.