This reverts commit 01d3eb64e7.
Bug: skia:
Change-Id: Ic05b89009eb59a231488bef382dd232a50d2b00f
Reviewed-on: https://skia-review.googlesource.com/124260
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>