This reverts commit 12b53fab6a4d82f2c434abafe8dd23fe4cf063f5. Change-Id: Id9428da055d3e7a8c309a32a3b8dc51f2f746e66