Followup r86367, don't make constructor protected just yet, few underlying callers...