Get rid of this

Change-Id: I89b251fcec026fd0bf400539b11f505a9b861956