Convert #228479 to Flügger