Old TODO removed since it's already fixed.