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

BUG=chromium:592692
LOG=N

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

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