Revert Buggy Costant Folding