This should recover regression caused by 7f11fba7 (https://codereview.chromium.org/1739233002).

TBR=bmeurer@chromium.org
BUG=chromium:592692, chromium:595265
LOG=N

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

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