Convert #228278 to Flügger