Backed out changeset d87d4e1f2e24 (bug 1034593) for bustage.