Fix RT #25283

Better late than never, right? :)