Fix upload forms following 2a486af (bug 888239)