This diff looks wrong to me. I think we're losing the ability to do trace debugging?