follow-up to r7262