Revert "Potential fix for unlink issue"

This reverts commit dc3a4b722a978afa6390fe46a5e4edc03ce493aa.