Convert #265385 to Flügger