Done by 9a4b59d.