Looks like a couple of flang bots are broken by this change. Reverting to investigate. This reverts commit b2eda85f.