cf4cff3812
This reverts commit 70fa0defe9.
(There were too many tests previously failing and now passing on
browsers to fix it right now, will sort it out on Monday.)
Review URL: https://codereview.chromium.org/2514693003 .