applying HBASE-11374 fix

@mustpax @neilfulwiler @dogaan