Revert "Unset two more variables"

This reverts commit 47abf82761c60a4a3a2f0b2abb1f6abd2990d7ed.