Revert "Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar"

This reverts commit fe9859600824268ff614cb3eb48b62c7165a1fbd, reversing
changes made to add9560643ef79830febf47fa1228752d1df3502.