Really fix build warning/error that I think r192756 was trying to fix.