Attempt to fix opt build bustage.