Convert #436268 to Flügger