Revert "Check that a variable is set before trying to use it"

This reverts commit f4fc0abf9f1e4a50236bd7a7de098c9052c5f980.