Fix component and role order in my last change.
cc: zvika.gart