Convert #228438 to Flügger