The proper fix (bb9eb262d4) caused compilation problems with HIP, so we're delaying it until 3.6. To fix the original bug report (#104586), this is a quick workaround that'll hopefully not upset the compiler. Pull Request #104723
bb9eb262d4