/* XXX should probably be version-dependent */