Use my fork until CommandLine change is merged.