DEVELOPER-987 Build regeneration slow or broken