Restore proper hash values ahead of big fix later