Revert "Merge pull request #13 from BlakeWu/bug-1009410"

This reverts commit 1875af348ecfba0c583723e7b05d53e256874bca, reversing
changes made to f9000e9ec6fb84a24ffe049e6a6372c0305ee0f1.