This fixes #8257.