CORE-5773: removed a TODO comment