Previous change also affects g_x2top.

Change-Id: I870fb041863854ba9237fb0c04ed8745544b80f3