cookies 2to3 again

Change-Id: Ic36a201f17213a8ecbbe0f8c59935ed9a391672c