This reverts commit 9a071e1d02f27bbcaf1d61a9cca577cc6c889abc. GitOrigin-RevId: 72380a15ccbc4e8d7fddcfdf0a9a48209152b8b9