Revert "Merge pull request #1685 from blackwhale/utf8-matcher"

This reverts commit 216ca01ca885e1507e2ca29229b73de27b4a1f7f, reversing
changes made to d56c1dbc08cfbeb9e57c70006bfce5f9fd0c2d7a.