Backed out changeset 9beed56cc02a (bug 1025062)
Backed out changeset 4ffb7cfcb7bb (bug 1025062)
Backed out changeset 353deb7b9d02 (bug 1025062) for breaking the build