[WIP] Temporarily avoid tracking the graceful close count