Convert #228077 to Flügger