Revert change to use ffi