Was a known pending TODO for quite some time already. This commit should have no behavior change at all.