Reverted array folding standard
Merge pull request #2243 from WouterJ/revert_standard

Reverted array folding standard