Convert #228539 to Flügger