Revert "Try custom hash function"

This reverts commit d57aa7d09d6188323d6d8dd54879ef81b7cd07a5.
First cut at merging sweeps