ACCUMULO-1584 applying Jonathan Hsieh's patch