Compile fix after bad merge.

VERY BAD MERGE, no treats.