Revert "Revert "Revert "Revert "Revert "Revert "Remove temporary directory""""""

This reverts commit 1d286505f377cf263bc261fed6d064b36bac6e2b.