0.16alpha.50: revert to the V2 hash table until we figure out a way to make the smaller one just as performant