This reverts commit edca320a2b42011f98c308fdf25fc0494c6a5454. Change-Id: I30ee93cfc1cac391ce152f03e9e13a1ad24dc91b