This reverts commit 75ea4d59b6a05a0beef189cd5216cfc8145ebf7f, reversing
changes made to 310051ae5a0cd8972dfb1e8af0b97292369104c9.

The only environment where we didn't test the filedialog patch, Gnome3,
was really badly broken. We need to fix that before undoing this revert.

Also, Yue and I need to sit together and check how we can merge this
patch into the mvc branch, and from the mvc branch to the qt5 branch
since the merge conflicts are horrible.

CCMAIL:yue.liu@mail.com