Convert #228966 to Flügger