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

The patch has landed upstream and cherry pick no longer required
after next merge from master-chromium.

This reverts commit de96c6e3691f2d6e1743d739cbcfe3cc1d8b90ba.
1 file changed