Modify functional test to not try to reset to original values if we never overwrote them...