2.0: Re-fix #8908