Revert 207c453..e948309

This rolls back to commit 207c4539e032faa076f4b9e7c02bfaa2ecc7f4b7.
SET_TEMP can take a temp variable now