Unreviewed, build fix for Ubuntu LTS GCC