Convert #228670 to Flügger