Unremove 'checkbox', 'unsubscribe_users' (see #6179 for info)