Revert "Merge branch 'b-rup-felipe'"

This reverts commit ecbc8e9086dfffef557dc6261e518fb103e37dd5, reversing
changes made to 72ddfa7dc9b3ed8af74a3f87294b5a87a2ee78d9.