Can you file an issue for this todo for 3.9.1 so we don't lose track of it?