Revert "Merge pull request #932 from onigoetz/patch-1"

This reverts commit 12a391c9d824f0eaebe577429ad20ab86e792d44, reversing
changes made to 439f7f6de0cb5b04c4cf160fdd02b59964d49a08.