Fix cibuild for good