Discovery mode toggle post-merge bug.