Convert #375337 to Flügger