Convert #228475 to Flügger