Follow-up fix to 3e2a4eefbed7002437c3f (re #11109)