Revert "Merge branch 'cerdiogenes-master'"

This reverts commit b385422eac43aeeb417b686ef0233e8cd51ac580, reversing
changes made to 1430c1722c811ec2a7c9b3f2dfa3d47a468e1059.