Update the rewheel module to be unicode safe, remove work around