This reverts commit 4f296cfb. It breaks opening odt and other zip-based files in external apps. That's what I get for delegating the testing :-) BUG: 311214