Revert "Merge pull request #308 from lmr/fix-var-tmp"

This reverts commit 954ebf4d5febd75157ddf0eb7e8631fe1d6af55b, reversing
changes made to 1662755962371fad8348f371289fce095dcb587a.