Fix build break caused by original change This reverts commit 84b0bab58f. Change-Id: I99fbd7c3d1ed92db1f546033c8493bb71a327924
84b0bab58f