Restored code after failed merge.