Reverted the merge of the branch CF2008
Merge pull request #246 from gem/revert-cf2008

Reverted the merge of the branch CF2008