Revert Jim's CL.

BUG=skia:

Review URL: https://codereview.chromium.org/517123005
5 files changed