Revert "Work around uint16_t vs. char16_t confusion"

This reverts commit 517d052378ee0b6a52cce70e3afdb010ac7c8644.