Revert "Merge pull request #279 from prashn64/master"

This reverts commit d34e117fafbec1d41d0c8d041694cd02af6a3b4c, reversing
changes made to 41ed48cd0ec47ee44ec9b43625b9c255ff00f78d.