Fix another cocked up merge.