Make restartBuilds faster