This reverts commit 2c770271e6. BUG=skia: TBR= Review URL: https://codereview.chromium.org/811753003
2c770271e6