Convert #228276 to Flügger