Drop the method swizzling to work around nil font issue.  Latest Omni drop fixed this