Another attempt at fixing duped builds