Recommitted changes that somehow got lost (again!)

Change-Id: Icd2a7d7972a8b65ac75be2e714d7fc7b2bd0c6db