Backed out changeset 635f44f65840 (bug 925185)
Backed out changeset 2a368c09333a (bug 925185)
Backed out changeset ceaf4e435c86 (bug 925185) to avoid merge conflicts