Simplify, in light of NET-496

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/trunk@1437659 13f79535-47bb-0310-9956-ffa450edef68