Revert "Merge pull request #154 from mayurjadhav/RG-198"

This reverts commit 63ab0828a603f9fa7937516bec6097bdf8d4ce50, reversing
changes made to 78cbc1a5f168ee35157925f04da28ad1e6e92a89.