@Jerry77oz since we're deprecating this, and not going to attempt to fix it you should remove the TODO here.