Convert #228778 to Flügger