Reverted changes to thrift files