Fixup from botched merge

Change-Id: I69c3039b2b9d5aa5d2f82fadd5a75257a74b9110