Bug 1098004 Follow-up to fix non-unified bustage. r=me