Reverted DB-2175 and applied HBase-12657 instead