Revert some no-longer-useful debugging helpers