This commit totally breaks build, we're moving the spotify stuff to a standalone spotify handler - something that should've been done from the start.