Revert "Merge branch 'erick' into python"

This reverts commit f3996247993ca41df4200e51ee3c6e7c49704c84, reversing
changes made to 09031839e2856ef4e9f88f0538c0e3ffe29ea5f2.