Revert "Merge branch 'master' into multibyte"

This reverts commit a81ee00b73766294ac46c6b84b2110c534540756, reversing
changes made to dd96a05c745768f730319b72537dc203578a18ec.