Reverted debug code