This reverts commit 4f0f4367. This seems to show some compile dependence problems, and also breaks flang.