Aligned with the origin/bug26469.