hbase-11094: https://issues.apache.org/jira/browse/HBASE-11094(addendum)