Revert "Merge pull request #917 from twoer/master"

This reverts commit d8de2fc2b7c9287bd32da8a9c333a442c15a296d, reversing
changes made to 669653093093a3adf354062c7b992038c975f7a3.