Bug 937024 - fix build bustage from bug 935305, rs=trivial,bustage