Convert #228236 to Flügger