Git buddies to load, make proxying work again in core