Fix build bustage, a=leo+