@sarina @dmitchell says this TODO has been around for a while - not introduced by this PR.