Previously this was not necessary, but now it fails to compile. I suspect this to be related to a gcc update.
