stupid cherrypick screwing up hashes