Convert #228627 to Flügger