This reverts commit 10c17c97. It causes undefined symbol error on chromium windows build. A small repro was uploaded to the code review.