Fixed build bustage from bug 864774