ref #9389 removing TODO comment as the situation is clarified now