Fix merge of THRIFT-2897 branch.