Convert #228289 to Flügger