Remove this comment, as this TODO has been done.