Revert "DEV-19791"

This reverts commit ae2c82d145e99e913cc9a329a4b973291ac32aa6.