Changed in f1b2af1