Revert "Merge pull request #441 from bb7555/master"

This reverts commit 148fff62300df6a9b347175ef698cd31fcd81cf3, reversing
changes made to d5f3274e3189b4923efcad596a9b40e49fe035be.