stupid cherrypick changing hashes ugh