Per the discussion here:
https://code.google.com/p/chromium/issues/detail?id=256636

Thanks to the Chrome team for the quick response!

This reverts commit d53ddc90.
(cherry picked from commit 6e630fbb)