This reverts commit 40f8b9251831c5f009fd476b1a3d216e126d3ef0. Change-Id: I9a1d861277e5d32405da5815c8b4e5d616febf10