follow-up to r8572