Switch to using HashUtil instead of DigestHelper