Followup r104676, r104688: