This fixes a recent regression in the 4.9 branch caused by b25059e8. BUG: 310365 FIXED-IN: 4.9.4 REVIEW: 107389