Revert r174133, r178901 and r178981 to fix Mac

There was a regression bug filed (bug 377445) shortly
after the original commit, however the author chose
not to revert, but rather instead attempt a fix.

The later of those fixes was marked not lgtm' by another
reviewer.

I'm rolling out the whole mess to unblock shipping M37.

R=eae
BUG=377445

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

git-svn-id: svn://svn.chromium.org/blink/trunk@180004 bbb929c8-8fbe-4397-9dbb-9b2b20218538