You can remove this TODO comment now :)