Fix build paths.

Reapplied, but not including regression testing.