Update from upstream and remove old translation technique.