Convert #265339 to Flügger