Don't force MD5

I'm not sure if this addresses all of the hashing issues outlined in #11486 but it's a start.