Fix a merge derp

Change-Id: Ied587fe5f9035a8ca7f044c575cc0b967ddd90f3