Restore correct code following merge error