This reverts commit 8c31e1db2a2cea4278503d6b9b27bca87946ef36. Change-Id: Id25f493ca272878c2105f9cd302db1e05284998d