Fix incomplete commit for (#11092)

This fixes a problem that was accidentally added in commit 25368634

Change-Id: Ia58d076bb50460e1bcbf33b270eac305a98f9795