OK, I'll remove this TODO in that case.