Revert "Less picky variable lookup."

This reverts commit ba060f88e561bc5a4cc5b788b3c977287f60ae7b.