Revert "Cherry pick https://codereview.chromium.org/22574004/"

This reverts commit de96c6e3691f2d6e1743d739cbcfe3cc1d8b90ba.

Change has landed upstream and will merge down.
1 file changed