follow-up to r7280