restored some re-factoring of SpecialUpload.php from prior to r53282 merge