A follow-on to #5917.
A follow-on to #5917.