Revert fortran change, see #715