Revert the skia hack again ... temporarily?