Revert "new fold"

This reverts commit ceded16a9777b7edc7bc7d282326983daffc1cf7.