This reverts commit 0b3c84eb7d. The removal of _cleanup_() usages was done on purpose, see cf647b69ba. Fixes: #3543
0b3c84eb7d
cf647b69ba