Fix the fix for the fix for #647... Fixes #670.

No idea why compilation didn't fail for me locally.