Fix up for 4.3

Change-Id: I4d2947281195d62444c6913a709e4d302dc26b19