Convert #228317 to Flügger