Convert #228635 to Flügger