This reverts commit 668cae1d. Too soon. I need this for debug. Change-Id: Ibeaec0139f511cf389049bdb7dae368a7bd8186b