Backed out changeset 4c2ec5c33ea9 (bug 911146)