Bug 965898 - Fix non-unified build bustage. r=me CLOSED TREE