Revert "Merge pull request #558 from myakura/myakura/text-combine-upright-9_1_3_1"

This reverts commit 2514256940c34ba727eacfdb48cfce5840b0870b, reversing
changes made to 6762cd3a55f9a835ded1405f5bef65b7b81b9638.