Leftover code modification from #5192.