follow-up to r7666