Backed out changeset 9ee3b91945ce (bug 918940)
Backed out changeset 74c696729302 (bug 918940)
Backed out changeset dc8642fe6529 (bug 893309) for build failures