Reason for revert:

Should be fixed after
https://chromereviews.googleplex.com/317197013/
https://codereview.chromium.org/1487413002/
https://codereview.chromium.org/1489293003/

TBR=sergiyb@chromium.org,tandrii@chromium.org
NOPRESUBMIT=true
NOTRY=true
BUG=chromium:561530

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

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