Backed out changeset 0f7fe4800ace (bug 1027631) for non-unified bustage.
CLOSED TREE