follow-up to r7584