FIx for problematic merge.