Fix a problem with multiple repos introduced by code reorg