Revert submitted: https://chromium-review.git.corp.google.com/c/chromium/src/+/7956610