Done in commit 424734acf745b56692fe40f1f3a64769af2be10d