I can go one better. See 1616c2dfe