Revert "Merge pull request #990 from chiragsanghavi/master"

This reverts commit eda2ee70de1bf7db7e0aba7c7b71aeb2c1c7eeec, reversing
changes made to 6d0b497201c3d98de4283e8a59a8e607e8e94700.