When re-execing, try with --test-config first, and revert if it fails.