Revert earlier libmbfl changes and fix in mbstring.c instead