Backed out changeset 0b08eb8e264b (Bug 1080934) for bc failures.