This reverts commit 19174878e25ebfd8806595f83df7bdea1d239c07. Change-Id: I98db2c9aa975495c5828b3d16b8b45f515e6a5fa