Revert "Improve OPML generation"

This reverts commit 16c8927aa51befa3a6be7cd845793388f8dfc821.
Improve OPML generation again