Reverted the last commits.

They were not intended to go into trunk.

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