RE: Build time regressions