Convert #486285 to Flügger