This reverts commit f0ebe32b2ea9aa75e8834becba56598fbdab545d. GitOrigin-RevId: 175501aa344a21898aae20284fa56f1d5ef6466f