Revert "GCP-7370"

This reverts commit 55a0e4583bada0f705b1c2e4365b31f2df93e035.
Merge branch 'master' into master_dynamic_datamanagers
GCP-7512