follow-up to r7784