Convert #232679 to Flügger