Add back the addresses for the general buildbot, Merge same