5aaa00ed55
This breaks the user interface of exporters, so revert for now until there
is a solution for this.
This reverts commit ee0d8426ab.