Bug 865561 Fix bustage of non-unified r=me CLOSED TREE