follow-up to r7628