Hand-merge in one of Victor's changes.