Mostly just addressing comments from #8452 (cherry picked from commit b1ccebf329e9a9d77894b9d4ff06aeb9d7317acf)