Revert "Merge pull request #682 from Humerus/patch-1"

This reverts commit 04c641b79bb4045cebef1cef5937a2c8897cb0b3, reversing
changes made to ba9b800eff33a24005a789e32702335981cf9ab4.

Revert