follow-up to r8357