Begin to add rebar-specific thrift files back