[Cleanup] Split the long hash changes into their own patch.