Fix fallout from 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5

Change-Id: Iffa0c948356e705f610e057892c84d43d0d3490b