This reverts commit 87bfb3576f6b76fa9838775e302ca0d74fc0071b. Change-Id: I8e7056dbd3068b915fecff13128a45bb6e99c073