Convert #613271 to Flügger