Convert #372979 to Flügger