Bug #2984: Apply fix for file uploads