Convert #165282 to Flügger