r5903: While I can't test IPv6, metze asked me to commit a matching change