This reverts commit 26d708d936, reversing changes made to 3ac85d31de. Change-Id: Ifc19f837bee7437707ddddf0b19cb6bce53dd2c5
26d708d936
3ac85d31de