Break circular dependency in translate
Redo build