4f999f2b6c
* Fix regression when deleting folder * Apply suggestion from code review
* Fix regression when deleting folder * Apply suggestion from code review