Bug 1038465: Fix bad merge to get rid of aSuggestedFilename (r=me)