Discovery: Remove redundant unsetting of the master flag