Revert "Code folding fix"

This reverts commit 967f88af394ffb5f39a460d42be2d6730f321975.