This reverts commit 64959325eb470489ca5757b9bd6eef97b402a0da. It broke the flang-aarch64-out-of-tree buildbot.