breaks debuggable tests. This reverts commit 23a8e354. Change-Id: I8e60b5c8f48525975f25d19e5e8066c1c94bd2e5