removing bottleneck around longer builds