ACCUMULO-1051 reverted previous change, which broke unit tests. Awaiting updated patch based on test failures and ticket discussions.

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