This is unhiding some unwanted changes too; but we'll fix that later. Change-Id: I35343815e99aafbec8e4ef4d0707499fb6219457