Changes from c4125442.