Fixing my own mess introduced in r41274. Fix #9446.