This partially reverts commit f2458128d0. Change-Id: I3a99a0e51eb1a4319fc8127f727b754eb22cce6e
f2458128d0