Convert #417489 to Flügger