Revert changes that breaks build

Change-Id: Ic836798f6e582ee82964fa36ac778eef0c301eb3
1 file changed