Convert #228577 to Flügger