Revert broken scrypt diff1 measurement fix attempts

This reverts 807148b699b841144c08d96b683b05a816c83dfe, 87e9ba1649890f15fb11a392091ce2fbb1c33139, and a8fdcc77e49dd2d1c4de05fb43ff1d7a429bb29f