Revert "Several skia tunings for JB_2.5"

This reverts commit cc5fd57075b85d98648308ea0251b506ed0cabae.