instead of overriding the var and then restoring it, just override it *only* when needed.