Revert "Merge genres on output"

This reverts commit 90e134074f8e81d1cce2e497387492e19faf014b.