Manual revert of r177859

Reason for revert: rebased test are failing on win7



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