Revert "Several skia tunings for JB_2.5"

This reverts commit cedbc22e2687ef2c8cc0abc824b4f5484d0bf4fa.