Revert cgo effort while I work on tests finishing running