Convert #228469 to Flügger