WIP sort entry keys in equals to make build bot happy (temp hack!)