Revert "we are building with the format 3.0 (git) packaging techniques now; simplify...