Yeah, your newly added TODO may very well be correct..