revert 'dirty hack' change to crypto.h.  need a better way for sure.