Oops, accidentally deleted Stefan's change item during merge.