Added old --system and --local flags back, but marked as deprecated.