Revert "s4-build Change default paths and --with flags for a 4.0 release"