Fix 0f8e52e72ab46334996303575262bf63f291a749 merge.