Revert removal of xunfunction(), people are using it already