Revert "Merge pull request #119 from arpitgupta/master"

This reverts commit 0ad3a1b99c548176283ac36f4fb8f4e6ec8d2cce, reversing
changes made to 3ed213f3b0aabb9e4061e2dde250f8e3923d3aa8.