Backed out changeset e253218e5f89 (bug 988486)
Backed out changeset e5edc899d2b2 (bug 988486) for rooting analysis failures; CLOSED TREE