Reverted the merge of the branch CF2008

This will solve the problem with oq-engine/master: https://ci.openquake.org/job/master_oq-engine/1343