Revert the debugger-libs fix - not sure what the side-effects of that commit might be