This reverts commit 173e5fe5f4. BUG=skia: TBR= Review URL: https://codereview.chromium.org/1010503002
173e5fe5f4