So this @TODO gets taken care of by #2861 ?