Simplify this

Change-Id: I78f98fc4917ca846ae93544a5d9fb7742734456f