Done in rev 8c059d1