Revert accidental changes that were part of r454579.

This is a partial revert of cec451003f8252189fea6bd053f53ff24d1a583d.
I included some additional, unrelated changes by accident.

[email protected]
BUG=698207

Review-Url: https://codereview.chromium.org/2727783005
Cr-Commit-Position: refs/heads/master@{#454635}
9 files changed