Continue porting to 4.0.x.