Revert "Merge pull request #472 from DarkSide666/patch-7"

This reverts commit cc8d830cc3c80267d73086c1f6daba184f81d953, reversing
changes made to 21501b0df365a9719e52ed75aeaf6fdf432d1e73.