Revert "Merge pull request #153 from mayurjadhav/RG-197"

This reverts commit 14824b8b86e0d8d4ea9528991cd19ac9d859a9fd, reversing
changes made to feb6d63ac4670a2e88ed499bc50db5b26c084d0b.