fully revert 444b670

breaks if slaves are not directly accessible.. all non-tags go through
proxy now