Remove persistent folding for now (don't really use folds)