Fix broken build caused by premature merge

Change-Id: Ida599739180505cb97f2b6f88d1d07605a542a9d
Signed-off-by: Rob Adams <readams@readams.net>