Let's also support the cancelling notification approach which can be more reliable

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>