Restored code lost in merge.