Fix build bustage for bug 877461