Port 59be4ba7

Original commit message:
This reverts commit cbfcee55.

R=mbrandy@us.ibm.com

BUG=

Review URL: https://codereview.chromium.org/1074953002

Cr-Commit-Position: refs/heads/master@{#27723}