Revert "Fix for gang leave"

This reverts commit fc27a66bdbd0f7b7cb27435d5a41543699303af8.