un-hack the hacks to deal with mystery upload bugs.