Revert "Merge branch 'cpaucar-master'"

This reverts commit 45d47648fdbb3a58d26b897661394af887ba3951, reversing
changes made to dbc7bc358ac73afdb0c938bdae17ba2b5e61ffbf.