Convert #417579 to Flügger