* commit '4c92f7cec761f1e6550a1cf3dd1305a186ce0e05': Revert workaround for Skia bug now that Skia has been fixed.