Just curious… Why is `build` renamed to `build2`? It seems to me that some of the subsequent diff hunks can be avoided if the rename didn't occur.