REL-1811: Fixed a compile bug after improper merging.