A shim around untrusted version 6 for compatibility