Yeahhhh... could be cleaner... but MEH

Change-Id: Id664f6522fabb99b55a84dfed4adb0e79f83d43d