Follow-up fix for the proxy fix I did for Jon Nelson's bug. It turned out I

was a bit too quick and broke test case 1101 with that change. The order of
some of the setups is sensitive. I now changed it slightly again.