This reverts commit bc0ca442a11fee5c610a71b50d8d0073d5293d2b. Change-Id: If0885877a1c976ed430d6e3a7a462e06042874fb