Rework to handle golden-common repos