TRUNK-3181: Removed wrong TODO