Bug 934739 - Part 2b: Fix build bustage; r=glandium on a CLOSED TREE