This reverts commit 0446f129 and df630231. There's a warning on flang-aarch64-latest-gcc related to strncpy using the result of strlen as a bound. I'll recommit with a fix.
