Convert #265338 to Flügger