Convert #164591 to Flügger