Fix merge derp

Change-Id: Ic51e308300514dcd2bab6baabb79ebd8e551b8c8
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>