Revert "Have the ability for the PFQ to both rev Chrome and ..."

bin/cros_mark_chrome_as_stable.py

Index: bin/cros_mark_chrome_as_stable.py
diff --git a/bin/cros_mark_chrome_as_stable.py b/bin/cros_mark_chrome_as_stable.py
index 2d88d58b628c7db85adcd36ef4b9ec075e609382..0b17218180ecf1971cc472fc0b71421178eb421c 100755
--- a/bin/cros_mark_chrome_as_stable.py
+++ b/bin/cros_mark_chrome_as_stable.py
@@ -345,12 +345,18 @@ def main():
   work_branch = cros_mark_as_stable.GitBranch(
       cros_mark_as_stable.STABLE_BRANCH_NAME, options.tracking_branch)
   work_branch.CreateBranch()
-  chrome_version_atom = MarkChromeEBuildAsStable(
-      stable_candidate, unstable_ebuild, chrome_rev, version_to_uprev,
-      commit_to_use, overlay_dir, sticky_ebuild)
-  # Explicit print to communicate to caller.
-  if chrome_version_atom:
-    print 'CHROME_VERSION_ATOM=%s' % chrome_version_atom
+  try:
+    chrome_version_atom = MarkChromeEBuildAsStable(
+        stable_candidate, unstable_ebuild, chrome_rev, version_to_uprev,
+        commit_to_use, overlay_dir, sticky_ebuild)
+    # Explicit print to communicate to caller.
+    if chrome_version_atom:
+      print 'CHROME_VERSION_ATOM=%s' % chrome_version_atom
+    else:
+      work_branch.Delete()
+  except:
+    work_branch.Delete()
+    raise
 
 
 if __name__ == '__main__':