Does decaffeinated tea/coffee count towards your 2L fluid intake in a day?

Presumably the reason normal tea and coffee doesn't count is because of the diuretic effect of the caffeine it contains. So does that mean decaf would count towards your recommended fluid intake?