This reverts commit 52d8aa79a31c5042d2b43d06f08fa28489b27d1b. Change-Id: Ic706e0fb469931664499d00fa3a221726b258673