This reverts commit 265168170d04fb1fd395dfd235588e1df3dad664. Co-authored-by: Kaushik Iska <kaushikiska@google.com>