Backed out changesets a7d4914ea11a and f3d36cf13ac1 (bug 1092010) for non-unified bustage.