crypto: Revert some changes in contributed code.