Upstream sync and remove debugger (not fully supported).