This will result in more reliably reaching a clean state.

Co-Authored-By: schneider <schneider@muc.ccc.de>
Signed-off-by: Rahix <rahix@rahix.de>