Revert "emergency fix for jukebox"

This reverts commit ef01c76e8a3fc59a5ee0c8525c70aa13b8d9c99b.