Backing out commit r250906 as it broke lld.