ACCUMULO-1707 applying Steve's patch