Revert "Add CIPD package support to swarming recipe api"

scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json

Index: scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json
diff --git a/scripts/slave/recipe_modules/swarming/example.expected/basic_0.8.json b/scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json
similarity index 94%
rename from scripts/slave/recipe_modules/swarming/example.expected/basic_0.8.json
rename to scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json
index 32781ba78a1a8e4c3c9dc6cb2e97f24cd613d806..e3e182644008edb8f20a1c9501b5770d6fdebcbd 100644
--- a/scripts/slave/recipe_modules/swarming/example.expected/basic_0.8.json
+++ b/scripts/slave/recipe_modules/swarming/example.expected/basic_0.4.json
@@ -86,7 +86,7 @@
     "name": "swarming.py --version",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
-      "@@@STEP_TEXT@0.8.6@@@"
+      "@@@STEP_TEXT@0.4.10@@@"
     ]
   },
   {
@@ -201,8 +201,6 @@
       "--idempotent",
       "--user",
       "joe",
-      "--cipd-package",
-      "bin:super/awesome/pkg:git_revision:deadbeef",
       "hash_for_win"
     ],
     "name": "[trigger] hello_world on Windows-7-SP1",
@@ -273,8 +271,6 @@
       "--idempotent",
       "--user",
       "joe",
-      "--cipd-package",
-      "bin:super/awesome/pkg:git_revision:deadbeef",
       "hash_for_linux"
     ],
     "name": "[trigger] hello_world on Ubuntu-12.04",
@@ -351,8 +347,6 @@
       "--idempotent",
       "--user",
       "joe",
-      "--cipd-package",
-      "bin:super/awesome/pkg:git_revision:deadbeef",
       "hash_for_mac"
     ],
     "name": "[trigger] hello_world on Mac-10.9",
@@ -389,8 +383,9 @@
       "--decorate",
       "--print-status-updates",
       "--verbose",
-      "--json",
-      "{\"base_task_name\": \"hello_world/Windows-7-SP1/hash_for_w\", \"tasks\": {\"hello_world/Windows-7-SP1/hash_for_w\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"}}}",
+      "--shards",
+      "1",
+      "hello_world/Windows-7-SP1/hash_for_w",
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",
@@ -451,8 +446,9 @@
       "--decorate",
       "--print-status-updates",
       "--verbose",
-      "--json",
-      "{\"base_task_name\": \"hello_world/Ubuntu-12.04/hash_for_l\", \"tasks\": {\"hello_world/Ubuntu-12.04/hash_for_l:2:0\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"}, \"hello_world/Ubuntu-12.04/hash_for_l:2:1\": {\"shard_index\": 1, \"task_id\": \"10100\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10100\"}}}",
+      "--shards",
+      "2",
+      "hello_world/Ubuntu-12.04/hash_for_l",
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",
@@ -547,8 +543,9 @@
       "--decorate",
       "--print-status-updates",
       "--verbose",
-      "--json",
-      "{\"base_task_name\": \"hello_world/Mac-10.9/hash_for_m\", \"tasks\": {\"hello_world/Mac-10.9/hash_for_m\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm-dev.appspot.com/user/task/10000\"}}}",
+      "--shards",
+      "1",
+      "hello_world/Mac-10.9/hash_for_m",
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",