Revert "Merge pull request #470 from DarkSide666/patch-6"

This reverts commit 21501b0df365a9719e52ed75aeaf6fdf432d1e73, reversing
changes made to 3d07dfe4b68d8a092be500cc20963fb7edb52eac.