follow-up to r7408