Revert "Progress in implementing Fold1"

This reverts commit 62c3f451bcabcdf456da7c35d81262e8059eec25.