This reverts commit 128a36526c14d03d9585c12e808c5fb7ffd3bc3c. Change-Id: Ibd687a9272d63feb842fba765b8b1d5165841527