Revert "Merge pull request #2284 from jaimeiniesta/patch-1"

This reverts commit a6b88d1e7e3fdb41e425d1a285dc7a73788d491b, reversing
changes made to 9bee0b6e2d60e61df136b81261110cc7dcccc52c.