1.9: Re-fix #8908