Compile fix after bad merge.

VERY BAD MERGE, no treats.
Merge pull request #4190 from Ccomp5950/merge_fix

Compile fix after bad merge.