Revert last change for extract.c, due to tests failing. We can't use