Revert "Merge pull request #1066 from espaan/patch-26"

This reverts commit b9904b68b3e1870ada65ec9ebe067efc69d6e493, reversing
changes made to c2998de7d07f52f89cd341960f3bac7b5fc2cecc.