Reverted debugging changes