Revert "WIP: favourites rework"

This reverts commit c542f42cf6a1ca7d5c8bdd15362aa9be7f0c15b8.