Convert #228230 to Flügger