Properly revert r1525229-1525230 due to failing tests.

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1525252 13f79535-47bb-0310-9956-ffa450edef68