Bug 1075136 - backout the commit