GCP-5842
Revert "GCP-5842"

This reverts commit 5ffe337e56b958bd0e489106c4b073990ce28c83.
GCP-5842