Fix struggling list.

Change-Id: Id2245195338bc38cb156cfbb7d54d736e97fe6c0