Revert "Start trying to catch unsetting variables."

This reverts commit bbaf808f322564fbbdbd365c103069a3dbf956d8.