eb5ef72747
This partially reverts commit 3dea10bcb95f12a406c601efa72f37fbb4792ea9. See https://issuetracker.google.com/issues/245626686