Initial porting to PO 2.x.