Convert #152521 to Flügger