Done in commit 20233fa