follow up from review #4663

#4663 

More review follow up.