There should be no functional change.

This is a reland of a portion of https://codereview.chromium.org/834113005/

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

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