Add support for undoing subscription cancellation #wip
close