This is another fixup for commit 1c8269b2. This is not covered by tests since they use a fake_send method.