Convert #228954 to Flügger