Revert "Pull the crypto headers even earlier"

This reverts commit c402874233c7fe634f82a74b525d05f3d4317af1.