Revert "Merge branch 'fix4' into dr_staging"

This reverts commit 928a1fbf12d94362ed3a396c32cf09df104f5af4, reversing
changes made to 685d11677aad735a6409a9c6c0787468bf217309.
Reverted all the changes
Reverted back the changes