follow-up to r7243