Convert #236785 to Flügger