BUG-579: Remove the dependency on GeneratedTOBuilderImpl to break a package cycle.