Is there a reason this no longer checks if we disassociate from the master?