Reverted temporary debug stuff