[Fixup] To be squashed with 3rd commit (unsubscribe)

Signed-off-by: Regis Merlino <regis.merlino@intel.com>