This broke the Mac and Windows builds, for reasons I'm still investigating. This reverts commit 2ddf244819. TBR=jmesserly@google.com Review URL: https://codereview.chromium.org/1813983003 .
2ddf244819