Redo r41164 with less breakage.