This reverts commit 3fd217b3f492c95c8550da2a36fffbc6f3a3b724. Change-Id: Icf32debc07b858c5ae2eb8a7bf4a6e95445a7466