Bug 1066280 - Fix non-unified bustage. CLOSED TREE