Become node_clone compatible again