Reinstate this testcase, but make the servers failure to deliver
non-fatal.

Fixes: #1414