Revert "Cleaned up 'mbstring' some more"

This reverts commit a7ed0daa1b5a08381682ac59fcacbdf176c1030b.