no longer need this TODO, 082d3c9f fixes