backporting to use 0.90 signatures.