Put a line on logs when this situation happens!
Remove a line spotted by @fitchner which is not needed at all
Remove commented out code since long time
Restore 989d361e88d08bd9e71bf7daafcb3b39af65bd3d to preserve a scenario that seems useful as suggested from @fitchner.
Correct variable test here, too. Ticket #3662
This is not true any longer (and required for L2TP+IPsec)