Easier than working out how to fix the fenv stuf... Change-Id: Id457d4fcd790b1fc13047cba29c7d47118196a87