Rolled back some debug info