Convert #438570 to Flügger