Shame on me, should have read my own TODO comment.