Revert "Merge pull request #109 from ysvenkat/v2.0.6"

This reverts commit 1f3a4c660900d494c70e132410f3ca0dd609022e, reversing
changes made to dc09ff2a7ed6026c49c8c8dd420437defdb0aabc.