I kind of prefer a dependency to duplicated code.

OTOH, cyclic dependency means possible race condition when we upload the pkgs :(