Convert #454281 to Flügger