Restored to working build (font issue present)