Revert "Ensure Unicode is handled correctly when dispatching"

This reverts commit b9dd976da9df76b7d1c858253ae2dfe2823fad27.