Fix dirty build breaking for no apparent reason

Change-Id: Ia71152e12a93aaaa62678931590525e946b7be35