jetpants_collins: handle lockless master replacement process more cleanly