Undo HBASE-7739 on bad merge


git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-7290@1445943 13f79535-47bb-0310-9956-ffa450edef68