tree c2d463af7150675b7ee838b05ea3aeb163e92192
parent de96c6e3691f2d6e1743d739cbcfe3cc1d8b90ba
author Ben Murdoch <benm@google.com> 1376228584 +0100
committer Ben Murdoch <benm@google.com> 1376228629 +0100

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

This reverts commit de96c6e3691f2d6e1743d739cbcfe3cc1d8b90ba.

Change has landed upstream and will merge down.