Convert #413677 to Flügger