#1038 Temporarily turned on use of relay for P2P stuff