Provisional commit, unicode.cc should handle poplar 24.5 better