Dramatic simplification of billionuploads resolver and make it work on
the first try