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