P&O returning to container shipping