Revert c565716..d2d7176

This rolls back to commit c5657165280782a7992b22070b9073deed343e55.
Create archive files
Further refinements to churn fact code