Backed out changeset 00611894f123 (bug 881092)
Backed out changeset 09a51539cea1 (bug 881092) for breaking the build