Convert #228681 to Flügger