Fix fallout from 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5

Change-Id: I9df591c084175848bb58a97db2241f18cbe53db2