Stop requiring HashWithIndifferentAccess

Change-Id: I4bf5f9c811f65afd051ae6b254ce60218c8199dd