Restore code lost in merge.