Reduction of code for download.php patch - refs BT#6759