Several reversions and revisions to return to a *mostly* working build.