Import from chacha-gb-crc-2.6.35-1643b58