Revert "Remove useless and maybe dangerous cleanup"
This reverts commit fea06603436ba2ca7dba24e221bf91c402031c75.
Revert "Remove useless and maybe dangerous cleanup"
This reverts commit fea06603436ba2ca7dba24e221bf91c402031c75.