Revert "Merge pull request #6287 from risaacson/fix_hash_in_var"

This reverts commit a80828745167b38065bbc3b14d615f1c3c225e5d, reversing
changes made to 6129ea7566ffd8113b2038076d4d1550cd6383a4.