This reverts commit fa4210a9. It causes compile failures, presumably because conflicting with another patch landed after I checked locally.