Revert "Update close() mechanism"

This reverts commit 6f5a359843a9b79511e53b6c1885735466972762.