This reverts commit e203ddde85. It is currently broken due to the included icu copy... revert this temporarily until icu is updated.
e203ddde85