Use the (more reliable) plumber mechanism instead of exit-handler