Fixing broken compilation caused by last merge.