Follow up to 66491f08fe86629fa25977bb3dddda06959f65e7. Backport of f10c52afabac25f2c10aca26d32dbe7e0e46082e from main.