Revert "Merge pull request #891 from niravmehta/master"

This reverts commit 9eda8d2d26bb802792349c5fe6be263d62d599b0, reversing
changes made to 0fb78b4eae1e9e362afe71c5e289a8528680ca9d.