back out the xmalloc/xfree changes for now