Log Message:
Simplify the IPv6 address handling patch

Also fix the completely incorrect code that was inteded to look for
the closing bracket (but clearly wouldn't work and wasn't hit in my
previous testing).