Revert "Merge pull request #4616 from crypt1d/master"

This reverts commit aec69c462718a5a506aca6c3d22ff1f34d099510, reversing
changes made to 88754d2904ddae53f45172cfe9bf534c8e21c060.