Revert folding to old behaviour (what was I thinking?)