Revert "Fix popular playlist"

This reverts commit d6269a91a076ba80ba974fbf8b2beb721b94c781.
Proper fix for popular mode