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

This reverts commit 9bbfba48cf956c3d2e361a0dead6694916cb53e5, reversing
changes made to 63ab0828a603f9fa7937516bec6097bdf8d4ce50.