Remove thrift, revert arch for splunk