This reverts commit 928e1656. BUG=skia: Review URL: https://codereview.chromium.org/1213093004.
Attach a file by drag & drop or click to upload
