Convert #265381 to Flügger