Revert "Merge pull request #1070 from jrrideout/issue-998"

This reverts commit ed1099cd7ffeac35fb454cfc75482ba334a6d109, reversing
changes made to 7b0920bfe0c1555244598118396b96c563b1128f.