Convert #228586 to Flügger