Convert #228231 to Flügger