Added unset variables back.