Restored code deleted by merge.