This reverts commit 72851d4417. See also: https://issuetracker.google.com/issues/123456213
72851d4417