Porting r50563 from Tak to mainline.