Revert "Merge pull request #1913 from diegozea/patch-2"

This reverts commit bf64ed8dcec194cd2e9afdf9f6e3815781c5ec97, reversing
changes made to 0783f4041bc95ec269215cc8d4dab0f1bef42209.