[picnic] restored old code