Backed out changeset a1fb4230b8b8 (bug 1034916) for non-unified bustage.
CLOSED TREE