Convert #228275 to Flügger