Revert "Merge pull request #186 from irvs/issue185"

This reverts commit c538d79a02f2f8092e8a55c6a3e819f7306e41f3, reversing
changes made to a5da6aff2a1e59c06dfd3fa8e64ee7c6852ea16c.