Comment 26 for bug 1021471

This is an experimental change that at least avoids the problem when running the test case. But while I saw no immediate problem, it isn't guaranteed to have no side effects and neither I can be sure there is not another case (only either source address or destination address not set) that would still suffer from the problem.
I added the same patch to the upstream bug report in the hope that this causes someone there to help with some information.