Merge "Revert "Crypto performance benchmark"" into nyc-dev