Works with 3.8.1.  Refactor build scripts.