Untrusted part of #58