Bug 1100773 patch 4 - Fix nonunified build bustage.