Stop using Thrift templates. Get rid of extra ThriftProtocol.