Convert #228759 to Flügger