Revert "Merge pull request #667 from nmpetkov/patch-1"

This reverts commit 0fe46bf61307e263c1c5606ad7588aca5c338166, reversing
changes made to 64497820b198466fa176c5ca50f08b77744911b6.