Revert to forked flanker with upstream fixes.

They still can't unicode; breaks everything.