Convert #228885 to Flügger