McDonald out, Lafley back in at P&G