Merge "Revert "More cyrpto failures...""