Remove XXX builtin support for now.