In https://hg.mozilla.org/integration/mozilla-inbound/rev/3ab2ff9b9f94 I accidentally pushed part 29 along with a backout for parts 22-29. This patch reverts that change. If this changset causes problems, the following changesets should be backed out: https://hg.mozilla.org/integration/mozilla-inbound/rev/477f46897b0b https://hg.mozilla.org/integration/mozilla-inbound/rev/6c345954bce5 https://hg.mozilla.org/integration/mozilla-inbound/rev/642e400b22a9 https://hg.mozilla.org/integration/mozilla-inbound/rev/9bdf7c2279fa https://hg.mozilla.org/integration/mozilla-inbound/rev/79cac8c71159 https://hg.mozilla.org/integration/mozilla-inbound/rev/cfe757e478d5 https://hg.mozilla.org/integration/mozilla-inbound/rev/eaf834051cbd