Put back some code lost in a merge.