As there are currently some bugs in the unsubscribe flow, I'd like to suggest that we submit a PR that doesn't contain the `Unsubscribe` functionality so we can merge this straight away.