Wrong merge from 67f636a1.