This reverts commit 78db3d0b. Reason for revert: Cause crash Test: none Change-Id: Iffdad2513158c0856a0d3b56f7667063f4bba91c