Revert "Fix some char16_t vs. uint16_t bits"

This reverts commit 02e78e9f995e99b360db418f877e3a93e2cb6361.