Fix merge derp

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