Bug 1034913 - Fix non-unified build bustage or something. CLOSED TREE