This reverts commit 1bdfbc68e22a64215ab8fa3e3d17676513546997. Change-Id: Ie3fdf53b33cb2f61c1878055940f52ed9dfc8b08