Previous fix was overriding not only the upload widget. Trying again...