Back out 9a1c527eeafc (bug 987387) for non-unified bustage
CLOSED TREE